From 104d34e54a2bf402619c5737c3c6870e2e060bae Mon Sep 17 00:00:00 2001 From: "robertlipe@gmail.com" Date: Sun, 2 Oct 2011 20:13:20 +0000 Subject: [PATCH] Use /translations for Mac and Windows. git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@4094 f51c46e8-681c-474f-0cfe-069cfd0219fb --- gpsbabel/Makefile.in | 10 +++++----- gpsbabel/gui/mainwindow.cpp | 3 +-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/gpsbabel/Makefile.in b/gpsbabel/Makefile.in index 139a23393..b29ea0a52 100644 --- a/gpsbabel/Makefile.in +++ b/gpsbabel/Makefile.in @@ -347,13 +347,13 @@ mac-release: mac-gui: gpsbabel - file gpsbabel | grep '2 architectures' || exit 1 - file gui/objects/GPSBabelFE.app/Contents/MacOS/GPSBabelFE | grep '2 architectures' || exit 1 - cd gui ; qmake && xcodebuild + # file gpsbabel | grep '2 architectures' || exit 1 + # file gui/objects/GPSBabelFE.app/Contents/MacOS/GPSBabelFE | grep '2 architectures' || exit 1 + cd gui ; qmake && make cd gui ; lupdate app.pro cd gui ; lrelease app.pro - mkdir gui/objects/GPSBabelFE.app/Contents/MacOS/lang - cp gui/*.qm gui/objects/gpsbabelFE.app/Contents/MacOS/lang + mkdir gui/objects/GPSBabelFE.app/Contents/MacOS/translations + cp gui/*.qm gui/objects/gpsbabelFE.app/Contents/MacOS/translations cp gpsbabel gui/objects/GPSBabelFE.app/Contents/MacOS cp -r gui/help gui/objects/GPSBabelFE.app/Contents/MacOS cp gui/gmapbase.html gui/objects/GPSBabelFE.app/Contents/MacOS diff --git a/gpsbabel/gui/mainwindow.cpp b/gpsbabel/gui/mainwindow.cpp index 4cb1bc05c..668bd7539 100644 --- a/gpsbabel/gui/mainwindow.cpp +++ b/gpsbabel/gui/mainwindow.cpp @@ -205,9 +205,8 @@ MainWindow::MainWindow(QWidget* parent): QMainWindow(parent) ui.outputWindow->setReadOnly(true); langPath = QApplication::applicationDirPath(); -#if defined (Q_OS_WIN) langPath.append("/translations/"); -#endif + // Start up in the current system language. loadLanguage(QLocale::system().name()); createLanguageMenu(); -- 2.30.2